Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 4 Jul 2011 07:45:17 +0000 (00:45 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 4 Jul 2011 07:45:17 +0000 (00:45 -0700)
commit0db929998fc667dcf75e95e7d97a1c3392401133
tree580a4e82b5a9fbd13168db58c6ad614d7a9f989b
parent61c96b050bcf4ed183fcf9a8b5f0819bbd57c40f
parentb24cf6f851cfe8343905958f022e64cf7a4ea222
Merge from trunk.